ipq40xx: split orbi devices in router and satellite

Netgear Orbi devices are split into router and satellite units. Even
though the hardware is mostly the same, the network configuration is
different. Router units have a designated WAN port while satellite units
have all available ports labeled as "Ethernet".
This splits the device trees into both unit types and adjusts the port
labels.

Signed-off-by: Christoph Krapp <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20877
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/ipq40xx/base-files/etc/board.d/02_network b/target/linux/ipq40xx/base-files/etc/board.d/02_network
index 773cb5a2ff8b2441630067c292ee60779f9dd443..29c437037dd35e7cc7b1b307aefa1df6b1f3d307 100644 (file)
--- a/target/linux/ipq40xx/base-files/etc/board.d/02_network
+++ b/target/linux/ipq40xx/base-files/etc/board.d/02_network
@@ -70,14 +70,14 @@ ipq40xx_setup_interfaces()
        buffalo,wtr-m2133hp|\
        ezviz,cs-w3-wd1200g-eup|\
        netgear,rbr40|\
-       netgear,rbs40|\
        netgear,rbr50|\
-       netgear,rbs50|\
-       netgear,srr60|\
-       netgear,srs60)
+       netgear,srr60)
                ucidef_set_interfaces_lan_wan "lan1 lan2 lan3" "wan"
                ;;
-       avm,fritzbox-7530)
+       avm,fritzbox-7530|\
+       netgear,rbs40|\
+       netgear,rbs50|\
+       netgear,srs60)
                ucidef_set_interface_lan "lan1 lan2 lan3 lan4"
                ;;
        avm,fritzrepeater-3000|\
@@ -245,9 +245,7 @@ ipq40xx_setup_macs()
                label_mac="$lan_mac"
                ;;
        netgear,rbr50|\
-       netgear,rbs50|\
        netgear,srr60|\
-       netgear,srs60|\
        pakedge,wr-1)
                wan_mac=$(macaddr_add $(get_mac_label) 1)
                ;;

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi-router.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi-router.dtsi
new file mode 100644 (file)
index 0000000..6bdd828
--- /dev/null
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi-router.dtsi
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qcom-ipq4019-orbi.dtsi"
+
+&swport1 {
+       status = "okay";
+
+       label = "wan";
+};
+
+&swport2 {
+       status = "okay";
+
+       label = "lan1";
+};
+
+&swport3 {
+       status = "okay";
+
+       label = "lan2";
+};
+
+&swport4 {
+       status = "okay";
+
+       label = "lan3";
+};

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi-satellite.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi-satellite.dtsi
new file mode 100644 (file)
index 0000000..b2c40f8
--- /dev/null
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi-satellite.dtsi
@@ -0,0 +1,27 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+
+#include "qcom-ipq4019-orbi.dtsi"
+
+&swport1 {
+       status = "okay";
+
+       label = "lan1";
+};
+
+&swport2 {
+       status = "okay";
+
+       label = "lan2";
+};
+
+&swport3 {
+       status = "okay";
+
+       label = "lan3";
+};
+
+&swport4 {
+       status = "okay";
+
+       label = "lan4";
+};

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
index ef88bb02a29da4841917a13a7bc651cca07943d9..10aa56de2713d8a2fda660419e142bd1d7fa376c 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-orbi.dtsi
@@ -278,30 +278,6 @@
        status = "okay";
 };
 
-&swport1 {
-       status = "okay";
-
-       label = "wan";
-};
-
-&swport2 {
-       status = "okay";
-
-       label = "lan1";
-};
-
-&swport3 {
-       status = "okay";
-
-       label = "lan2";
-};
-
-&swport4 {
-       status = "okay";
-
-       label = "lan3";
-};
-
 &ethphy4 {
        status = "disabled";
 };

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts
index 26e87b808c8eba48dc87a2ebd8d137c3782def40..1c579dcdfb1aed3fa5e1ee5ba18ff1d78f7600fd 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr40.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019-orbi.dtsi"
+#include "qcom-ipq4019-orbi-router.dtsi"
 
 / {
        model = "NETGEAR RBR40";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts
index f83f75b46438ea68c3aa02e43501cb1ff04abc5d..81e846fb1f0d1da52882bde2ff1a3e62546dd5e5 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbr50.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019-orbi.dtsi"
+#include "qcom-ipq4019-orbi-router.dtsi"
 
 / {
        model = "NETGEAR RBR50";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts
index 2dfa0c96546fdb4f3ea2e42119103c6a10330447..6ff0ed8bb18a4516df374d871712f711a9d6ad1f 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs40.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019-orbi.dtsi"
+#include "qcom-ipq4019-orbi-satellite.dtsi"
 
 / {
        model = "NETGEAR RBS40";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts
index 9151c5d33c59bedb0f612aa828711eaa03c22732..3ac6df3761590dfbdf558b141b95ac1de180857b 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-rbs50.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019-orbi.dtsi"
+#include "qcom-ipq4019-orbi-satellite.dtsi"
 
 / {
        model = "NETGEAR RBS50";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts
index 80bcb2e204b95b7fc5c56a21fa666315c6075ecb..c137b41ee84d1abc583db06f218732b60ca1b9c1 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srr60.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019-orbi.dtsi"
+#include "qcom-ipq4019-orbi-router.dtsi"
 
 / {
        model = "NETGEAR SRR60";

diff --git a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts
index 65bb7ac3977c39bd98c085b2e4ad8e9f95bcf984..5b09e1ee24ecf7caa9467226c11536ca800ca5ab 100644 (file)
--- a/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts
+++ b/target/linux/ipq40xx/files-6.12/arch/arm/boot/dts/qcom/qcom-ipq4019-srs60.dts
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 
-#include "qcom-ipq4019-orbi.dtsi"
+#include "qcom-ipq4019-orbi-satellite.dtsi"
 
 / {
        model = "NETGEAR SRS60";